Auto merge of #4051 - alexcrichton:fix-flaky-test, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 16 May 2017 01:16:03 +0000 (01:16 +0000)
committerbors <bors@rust-lang.org>
Tue, 16 May 2017 01:16:03 +0000 (01:16 +0000)
commit8e35fd7d8b7b82ff09ee9b7178201a8b01843b98
treeba907fb68a8cb3866c0b1e9a0d253a42ce445439
parent3def3bf79e2f02db47a4bede8c0d50a343af448c
parent7b44acc6eb13bc9eeb812ecffc0046a115bd9bc5
Auto merge of #4051 - alexcrichton:fix-flaky-test, r=alexcrichton

Fix a flaky concurrent test with correct locking

The recent refactoring to clone the bare registry left in an accidental path
where index checkouts could clobber one another. This commit updates the logic
with proper locking and attempt ordering, attempting a full retry of the open
operation after the index locked.